diff --git a/shep/state.py b/shep/state.py
index ea7018d..222e59a 100644
--- a/shep/state.py
+++ b/shep/state.py
@@ -233,7 +233,7 @@ class State:
         if v == None or v == 0:
             return self.base_state_name
         c = 1
-        for i in range(1, self.__bits):
+        for i in range(self.__bits):
             if v & c > 0:
                 r.append(self.name(c))
             c <<= 1
diff --git a/tests/test_state.py b/tests/test_state.py
index 863aa8d..95f7627 100644
--- a/tests/test_state.py
+++ b/tests/test_state.py
@@ -117,12 +117,13 @@ class TestState(unittest.TestCase):
         states = State(3, check_alias=False)
         states.add('foo')
         states.add('bar')
+        states.add('baz')
         states.put('abcd')
         states.set('abcd', states.FOO)
-        states.set('abcd', states.BAR)
+        states.set('abcd', states.BAZ)
         v = states.state('abcd')
         s = states.name(v)
-        self.assertEqual(s, '_FOO_BAR')
+        self.assertEqual(s, '_FOO_BAZ')
 
 
     def test_peek(self):