Fixup for previous commit

Hopefully closes issue #2