remove double callback issue