Fixed issue with callbacks not having the correct context.