Fix random huge geo heading

Closed James Ramsay requested to merge fix-geo-heading into master