fixes #1511