Fix for #684

Fixes #684