Fixed wrong handling of UserWaypoints with corrected coordinates