coverage and bug fix