Attempted to fix navigation