callback bug fix