Fixed #21832