diff --git a/drivers/telescope/lx200_OnStep.cpp b/drivers/telescope/lx200_OnStep.cpp
index da629f3..0ea27fc 100644
--- a/drivers/telescope/lx200_OnStep.cpp
+++ b/drivers/telescope/lx200_OnStep.cpp
@@ -53,7 +53,7 @@ LX200_OnStep::LX200_OnStep() : LX200Generic(), WI(this), RotatorInterface(this)
     currentCatalog    = LX200_STAR_C;
     currentSubCatalog = 0;
 
-    setVersion(1, 12);   // don't forget to update libindi/drivers.xml
+    setVersion(1, 13);   // don't forget to update libindi/drivers.xml
 
     setLX200Capability(LX200_HAS_TRACKING_FREQ | LX200_HAS_SITES | LX200_HAS_ALIGNMENT_TYPE | LX200_HAS_PULSE_GUIDING |
                        LX200_HAS_PRECISE_TRACKING_FREQ);
@@ -543,7 +543,9 @@ bool LX200_OnStep::updateProperties()
         LOGF_DEBUG("OSFocuser1: %d, OSFocuser2: %d, OSNumFocusers: %i", OSFocuser1, OSFocuser2, OSNumFocusers);
 
         //Rotation Information
-        if (!sendOnStepCommand(":rG#"))  // do we have a Rotator 1
+        char response[20];
+        getCommandString(PortFD, response, ":GX98#");
+        if (response[0] == 'R' || response[0] == 'D')
         {
             LOG_INFO("Rotator found.");
             OSRotator1 = true;
@@ -2868,7 +2870,9 @@ bool LX200_OnStep::ReadScopeStatus()
     }
 
     //TODO: Improve Rotator support
+    if (OSRotator1){
     OSUpdateRotator();
+    }
 
     //Weather update
     getCommandString(PortFD, TempValue, ":GX9A#");
diff --git a/drivers/telescope/lx200_OnStep.h b/drivers/telescope/lx200_OnStep.h
index d8a0755..b137fe3 100644
--- a/drivers/telescope/lx200_OnStep.h
+++ b/drivers/telescope/lx200_OnStep.h
@@ -25,6 +25,9 @@
     ===========================================
     
     Version not yet updated:
+    Version 1.13:
+    - Timeouts and misc errors due to new behavior of SWS (SmartWebServer)
+    Made conditions for Focusers and Rotator polling
     Version 1.12: 
     - New timeout functions in INDI which significantly reduce startup times waiting for detection to fail. (Min time before was 1 second, current timeout for those is now set to 100 ms (100000 us which works well even with an Arduino Mega (Ramps) setup)
     - Cleanup and completely control TrackState. (Should eliminate various issues.)