Fixes #1120