diff --git a/examples/tests/cases/case_swipe.yaml b/examples/tests/cases/case_swipe.yaml
index 86bb9064..35db4b50 100644
--- a/examples/tests/cases/case_swipe.yaml
+++ b/examples/tests/cases/case_swipe.yaml
@@ -14,9 +14,9 @@ SwipeElementsTest:
     Role: $AND_CLI_USER$
     Element1:
       Strategy: xpath
-      Id: '//android.support.v7.widget.RecyclerView/android.view.ViewGroup[5]'
+      Id: '//android.view.View[5]'
     Element2:
       Strategy: xpath
-      Id: '//android.support.v7.widget.RecyclerView/android.view.ViewGroup[1]'
+      Id: '//android.view.View[1]'
   - Type: sleep
     Time: 5
diff --git a/lib/core/appium_server.rb b/lib/core/appium_server.rb
index b92767d1..24127de7 100644
--- a/lib/core/appium_server.rb
+++ b/lib/core/appium_server.rb
@@ -42,7 +42,7 @@ def stop
       `for /f "tokens=5" %a in ('netstat -aon ^| find ":#{@port}" ^| find "LISTENING"') do taskkill /f /pid %a`
     else
       while true
-        ps = `ps -A | grep "appium -p #{@port}"`
+        ps = `ps -A | grep "appium --base-path=/wd/hub -p #{@port}"`
         break unless ps.include?("node")
         ps.split("\n") do |process|
           next if process.include?("grep")