fixed templatizing