Fix callback support for R14
Merge pull request #138 from kxepal/fix-r14-callbacks

Fix callback support for R14