OPAL-1756 - fixed
Merge pull request #152 from kazoompa/bug-OPAL-1721

OPAL-1756 - fixed