[BUGFIX] fixes issue #61843 from forge