Fixes #811