return callback fix