Fixing the callbacks issue