diff --git a/lib/hyper-store/state_wrapper/argument_validator.rb b/lib/hyper-store/state_wrapper/argument_validator.rb
index 84492bb..91a58c4 100644
--- a/lib/hyper-store/state_wrapper/argument_validator.rb
+++ b/lib/hyper-store/state_wrapper/argument_validator.rb
@@ -35,8 +35,11 @@ def parse_arguments(*args)
           end
 
           name, initial_value = args[0].shift
-        # Otherwise just the name is passed in by itself first
+        elsif args.count == 3
+          # name, initial value is passed in by first and second
+          name, initial_value = args.shift(2)
         else
+          # Otherwise just the name is passed in by itself first
           name = args.shift
         end