Bug fixing

Jira Issue: WP-1034