XCOMMONS-710: Velocity parameter conversion fails under some circumstances