Fixed the callbacks