Fixed registration tracking