resolved the refined numerical issues of trajectories hitting singularities