callback bug fixed