fixes #9629