Fixes #794