diff --git a/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs b/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs
index 62db055..2283ccc 100644
--- a/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs
+++ b/Meade.net.Telescope.UnitTests/TelescopeUnitTests.cs
@@ -839,16 +839,16 @@ namespace Meade.net.Telescope.UnitTests
             _sharedResourcesWrapperMock.Verify(x => x.SendBlind(expectedCommand, false), Times.Once);
         }
 
-        [TestCase(TelescopeList.Autostar497, "43Ef")]
-        public void AlignmentMode_Set_WhenAutostarFirmwareToLow_ThenThrowsException(string productName, string firmware)
-        {
-            ConnectTelescope(productName, firmware);
+        //[TestCase(TelescopeList.Autostar497, "43Ef")]
+        //public void AlignmentMode_Set_WhenAutostarFirmwareToLow_ThenThrowsException(string productName, string firmware)
+        //{
+        //    ConnectTelescope(productName, firmware);
 
-            var excpetion = Assert.Throws<PropertyNotImplementedException>(() => _telescope.AlignmentMode = AlignmentModes.algAltAz);
+        //    var excpetion = Assert.Throws<PropertyNotImplementedException>(() => _telescope.AlignmentMode = AlignmentModes.algAltAz);
 
-            Assert.That(excpetion.Property, Is.EqualTo("AlignmentMode"));
-            Assert.That(excpetion.AccessorSet, Is.True);
-        }
+        //    Assert.That(excpetion.Property, Is.EqualTo("AlignmentMode"));
+        //    Assert.That(excpetion.AccessorSet, Is.True);
+        //}
 
         [Test]
         public void ApertureArea_Get_ReturnsExpectedResult()
diff --git a/Meade.net.Telescope/Telescope.cs b/Meade.net.Telescope/Telescope.cs
index a856d95..26318c9 100644
--- a/Meade.net.Telescope/Telescope.cs
+++ b/Meade.net.Telescope/Telescope.cs
@@ -1030,8 +1030,8 @@ namespace ASCOM.Meade.net
                 CheckConnected("AlignmentMode Set");
 
                 //todo tidy this up into a better solution that means can :GW#, :AL#, :AA#, & :AP# and checked for Autostar properly
-                if (!IsGwCommandSupported())
-                    throw new PropertyNotImplementedException("AlignmentMode", true);
+                //if (!IsGwCommandSupported())
+                //    throw new PropertyNotImplementedException("AlignmentMode", true);
 
                 switch (value)
                 {