Revert 3376714b599c8abc6c58b635d46ebf1c5338d2c3, the code order is not related to command "Q" mapping bug (#5)