add heir support
bug fix