Fix #31

In case this is not too late for 1.0.