Fixed navigation behaviour bug