fix: Resolve [#3483386] "Fix regressions"