fix issue #30990