Hopefully fixes #16

See discussion in #16.