fixes #1560