Implemented #99 with a test.