OPAL-2013, OPAL-2007 - fixed bugs
Merge pull request #284 from kazoompa/bug-OPAL-2013

OPAL-2013, OPAL-2007 - fixed bugs