bug fix 7 done