Other BIG FIXES on callbacks.
other BIG FIXES on callbacks