The initial fix was for #90 (see title), this was an additional commit. Should probably have split those out, but that'd have played merge hell on my branching