Fix Waypoint for corevp