fix 477 part IIB, #18503