Fixed callbacks in 3.2