Fixed #8770