fixed velocity issues