Comments bug fix