OPAL-2165 - Fixed