Legit fix for entity tracking issues