Bugfixing

Jira-issue: WP-349