restore old fix from Michele that has been lost

Jira-issue: WP-1280