Fixed bug

Jira issue: wp-1036