bug fix complete