Fix UT
Merge pull request #1266 from andrerod/dev

Fix UT