Fixing minor problem
Jira: WP-1078