fixes #1530