bug fix

Jira Issue: WP-1024