Fixed #16892