Bug fixing

Jira-issue: WP-1110