fixes #9697