Fixes #1133