Fixes tracking code (once again)