fixed tracking issues