Corrected callbacks