Speed fix (33/37)

Speed fix