correct comment template like master