[2.1] Fixed Callbacks

Fixes issue 1 in #325.