Speed fix (35/37)

Speed fix