fixes #9616