OR-25 fix comment header behaviour