fix #3341: Problem with special characters in waypoint