OPAL-1630

Bug fixed