fix undefined callbacks
Merge pull request #1 from lfryc/conflict

fix undefined callbacks