fix U4-1477
Merge pull request #183 from mkariti/U4-1477

fix U4-1477