OPAL-2605 - code review correction