Fix bug in callbackStorage

Jira issue: wp-748
Merge pull request #458 from TobyEalden/callback-fix

Fix bug in callbackStorage