Bug fix to velocity