Fix navigation bug