- Patch #6552 by Gerhard: fixed problem with user callbacks that slipped in with Natrak's last commit.