Fixes #1071