[2.1] Fixed Callbacks

Fixes #325.