Fix UT
Merge pull request #614 from andrerod/dev

Fix UT