Callback bug fix