Trying to fix navigation bug