diff --git a/src/examples/test_segwayRMP400.cpp b/src/examples/test_segwayRMP400.cpp
index 3f57ab2afcb63cc8f6789d7958d0cbb7454ccf15..2186490188ac6af222ae01c078f4be98c3d65397 100644
--- a/src/examples/test_segwayRMP400.cpp
+++ b/src/examples/test_segwayRMP400.cpp
@@ -40,7 +40,8 @@ int main(int argc, char *argv[])
     sleep(1);
     segway->move(0.05,0.0); // 5cm per second 10 seconds = half a meter
     int i;
-    for(i=0;i<10;i++)
+    //for(i=0;i<10;i++)
+    for(;;)
     {
       sleep(1);
       cout << (*segway) << endl;
diff --git a/src/segway_RMP400.cpp b/src/segway_RMP400.cpp
index f40ca9389a4308030fdc2294478b3850b17456a4..71ef1bc89c087d9cae9a7b183887798b6ea53849 100644
--- a/src/segway_RMP400.cpp
+++ b/src/segway_RMP400.cpp
@@ -277,7 +277,7 @@ CSegwayRMP400::stop()
     for (unsigned int i=0;i < segways_.size();i++)
         segways_[i]->stop();
 
-    status_ = rmp400_off;
+    //status_ = rmp400_off;
 }
 
 CSegwayRMP400::~CSegwayRMP400()