Velocity bug fix