[#69561940] Fixed