Speed fix (18/37)

Speed fix