test and bug fix