Speed fix (28/37)

Speed fix