OPAL-2013, OPAL-2007 - fixed bugs