Fixed callbacks
Merge pull request #326 from GrahamCampbell/2.1-callback

[2.1] Fixed Callbacks