Fixes #1090