FIX: Navigating to None was not working