Don't compute velocity if not needed

fixed