fixed the callback problem