Fixes #1074