fix event tracking