adding support for correct lat/lon