Re-fix entity tracking error
Merge pull request #24 from cheddar262/master

Re-fix entity tracking error