fixes #1525