Coverage and bug fix