Fixed decreasing speed and calcCurrentSpeed