Fix template (raw values)