diff --git a/CMakeLists.txt b/CMakeLists.txt
index 01d54f51..84e16baf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.6.0)
-project(win-vind VERSION 5.5.1)
+project(win-vind VERSION 5.5.2)
 set(INTERNAL_VERSION ${PROJECT_VERSION}.0)
 
 if(NOT CMAKE_BUILD_TYPE)
diff --git a/src/bind/window/switch_win.cpp b/src/bind/window/switch_win.cpp
index 67b30d9b..de395f52 100644
--- a/src/bind/window/switch_win.cpp
+++ b/src/bind/window/switch_win.cpp
@@ -85,16 +85,14 @@ namespace vind
                         continue ;
                     }
 
-                    // Map the inputs except for h and l.
-                    if(!ihub.enqueue_mapped(input, count, mode)) {
-                        continue ;
-                    }
-                    if(!ihub.fetch_input(input, count, mode, false)) {
+                    if(input->empty()) {
+                        input->execute(count) ;
+                        break_flag = true ;  // executed some commands.
                         continue ;
                     }
 
-                    input->execute(count) ;
-                    break_flag = true ;  // executed some commands.
+                    // Map the inputs except for h and l.
+                    ihub.enqueue_mapped(input, count, mode) ;
                 } while(!ihub.is_empty_queue()) ;
 
                 if(break_flag) {