fixes #1570