Fix comments issue