Fixes #783