Removed templates helper -> cause of bug