Allow template to work in q 0.8 or 0.9