Template settings override fix