Fixes #1032