Fix for OOIION-619
Merge pull request #423 from tgiguere/OOIION-619

Fix for OOIION-619