Fixed persisted template variables