have to call templates correctly...

Change-Id: I68d900076fe3ac6ff42d0c2e5f2d2a953a19b562
Merge "have to call templates correctly..." into production