fixes #1535