handle callback fix


Jira-issue: WP-1106