Speed fix (17/37)

Speed fix