Fix for template params not being passed