Support for "correct" callbacks