Comment Bug fix