fixes #8816