Fix #49
Make sure all tests pass