Fix gps tracking