Fixes #1535