tweak to check callbacks