OPAL-2165 - Fixed
Merge pull request #397 from kazoompa/bug-OPAL-2165

OPAL-2165 - Fixed