Fix for callbacks