fix OOIION-1584
Merge pull request #1610 from carueda/OOIION-1584_rebase

fix OOIION-1584
Looks good. EH