Speed fix (30/37)

Speed fix