Issue 725

Fixes #725.