diff --git a/autopep8.py b/autopep8.py
index 27809fc9..75cb27d0 100755
--- a/autopep8.py
+++ b/autopep8.py
@@ -3330,7 +3330,7 @@ def filter_results(source, results, aggressive):
                 continue
 
         if r['line'] in commented_out_code_line_numbers:
-            if issue_id.startswith(('e26', 'e501')):
+            if issue_id.startswith(('e261', 'e262', 'e501')):
                 continue
 
         # Do not touch indentation if there is a token error caused by
diff --git a/test/test_autopep8.py b/test/test_autopep8.py
index 64d30eb2..5f4dbed8 100755
--- a/test/test_autopep8.py
+++ b/test/test_autopep8.py
@@ -271,7 +271,7 @@ def test_format_block_comments_should_only_touch_real_comments(self):
         commented_out_code = '#x = 1'
         self.assertEqual(
             commented_out_code,
-            fix_e265_and_e266(commented_out_code))
+            fix_e266(commented_out_code))
 
     def test_fix_file(self):
         self.assertIn(
@@ -2238,6 +2238,12 @@ def test_e265_only(self):
         with autopep8_context(line, options=['--select=E265']) as result:
             self.assertEqual(fixed, result)
 
+    def test_e265_issue662(self):
+        line = "#print(\" \")\n"
+        fixed = "# print(\" \")\n"
+        with autopep8_context(line, options=['--select=E265']) as result:
+            self.assertEqual(fixed, result)
+
     def test_ignore_e265(self):
         line = "## A comment\n#B comment\n123\n"
         fixed = "# A comment\n#B comment\n123\n"
@@ -2256,6 +2262,12 @@ def test_e266_only(self):
         with autopep8_context(line, options=['--select=E266']) as result:
             self.assertEqual(fixed, result)
 
+    def test_e266_issue662(self):
+        line = "## comment\n"
+        fixed = "# comment\n"
+        with autopep8_context(line) as result:
+            self.assertEqual(fixed, result)
+
     def test_ignore_e266(self):
         line = "##A comment\n#B comment\n123\n"
         fixed = "## A comment\n# B comment\n123\n"
@@ -3167,7 +3179,7 @@ def test_e501_with_comment(self):
 # http://foo.bar/abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-
 
 # The following is ugly commented-out code and should not be touched.
-#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx = 1
+# xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx = 1
 """
         with autopep8_context(line, options=['--aggressive']) as result:
             self.assertEqual(fixed, result)
@@ -6442,7 +6454,7 @@ def test_e501_experimental_with_comment(self):
 # http://foo.bar/abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-abc-
 
 # The following is ugly commented-out code and should not be touched.
-#xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx = 1
+# xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx = 1
 """
         with autopep8_context(line, options=['--experimental',
                                              '--aggressive']) as result:
@@ -7287,6 +7299,11 @@ def test_e501_experimental_with_in(self):
             self.assertEqual(fixed, result)
 
 
+def fix_e266(source):
+    with autopep8_context(source, options=['--select=E266']) as result:
+        return result
+
+
 def fix_e265_and_e266(source):
     with autopep8_context(source, options=['--select=E265,E266']) as result:
         return result