Fixes tracking functionality.