This should resolve the missing lat/long cases