Fix callback calls
Merge pull request #10 from wiruzx/fix-callback

Fix callback calls