Fix for manual nav