Added callback check