Fixes #1076