fixes #8569