Correcting callbacks
Merge pull request #504 from Andr3as/master

Corrected callbacks