[RFR] Fix issue #17

Closes issue #17.