Fixed the callback problem