Improvement of the Internal Consistency in Trajectory Surface Hopping