fixed traking code