Fixes #1069