Fixes #1534