Possible fix for the speed change bug