fix dispose, deco / fix tir