FIX base tpl conflict