Fix for extending templates, passing in existing options