Fix trouble with php/html-comments templates from issue #32