Fixes #813