Fixing registration tracking