Re-fix entity tracking error