Added fix for navigation route handler.