Fixing navigator bug