Correct the bug in Navigator