Fixes #15

Should there be new tests that verify this change (and the one below)?