Fix #65

This is actually a pretty critical thing and probably the tests should have caught this! I recommend merging and making 1.0.2 immediately afterwards.