Fixup for null callback