more callback bug fixing