Speed fix (20/37)

Speed fix