fixed #19536 thanks to a.fazelli