fixes #1460