Fixes #1073