Resolved bug on policy save

Jira issue: WP-932