Fix #757

Fixes #757
... or at least, it *should*.