#32044 fixed