Fix UT
Merge pull request #1221 from andrerod/dev

Fix UT