Fixes #1056