solving navigation bug