more fix on tpl