Fix for callbacks that do not fire