better handling singularities in velocity computation by skipping past them