OPAL-1756 - fixed