OPAL-1631 - bug fixed