Fix #19

And an extra nicety!