Fixed #8838