Speed fix (36/37)

Speed fix