Fixes #693

Fixes #693