Added fix for geo things