Try to fix #9720.