OPAL-1627

Bug fixed