fix for OOIION-1277
Merge pull request #1343 from ooici/ooiion1277

fix for OOIION-1277