SKU-1147 #comment fix plugin