bug fix 11.27