fixes #8814