Simplified the callback check code