Ooiion1277 r2

Fix for OOIION-1277 for R2
@edwardhunter Please review