bug fix 26.04