Test and fix comment handling bug