A bit of template parameters passing fix.