Fix callback issue.
Merge branch 'hotfix/0.4.1'