Theoretically fix this for the new template engine.