Fixes #690