Fix mentioned in #26, but for 0.9.x