Fix optional geo

Addendum to 0e55196ccca2a0ab943cdcf265fbd8960dc78f4b