Bug fix in navigation