OPAL-1634

Bug fixed