Hotfix for current active waypoint ID