Fixed the location update via the listener