bug fix 95%