Fix for Issue #1

Also for: https://github.com/Singly/hallway/issues/469