VE-999 Fix tracking event not firing more than once