Safe callbacks fix