ticket:3 tpl fix