Fixed issue with velocity