Fix issue with geo locatable