Comments issue fix.