Fix for overtaking issue