Fix to callback