bug fix 9.1 ~ continued