fix for OOIION-1277

Fix for OOIION-1277
@edwardhunter Please review