keep previous logic [Fixes #78839758]