Fixed the bug in normal mode