Fixes #1035