Fixed navigation bug