Comment bug fix