Speed fix (24/37)

Speed fix