Fixes #790