Added a speed fix