Unable to add golf shots in the correct order

Hey there, 

I have the following issue and I am not sure how to solve it. 

The left image shows how the shots are being detected it missed some. 
Now i try to add them, but it always "thinks" the last one is the "green" shot. Deleting all shots does not work as well, as the first shot is always coming back, whenever I open the shot map.

How can this be solved?