Array handling fix

Jira Issue: WP-1034