bug fix before unit test