All tests pass. fixes #1