fixes #8560