Fixed the speed bug