fix UT
Merge pull request #477 from andrerod/dev

fix UT