fixes #1529