AI-581 - bugfixing