callback fixup