Geo fix

Merged Whitney Armstrong requested to merge geo_fix into master

Merge request reports