fix regression of #592438 caused by commit for #592433