Fixed multiple callback bug