Re-fix #8908