fix UT
Merge pull request #823 from andrerod/dev

Fix UT