Fixes #785