fixes #8880