Fixes issue causing exception when entities start getting recycled
Merge pull request #5 from Yeriwyn/fix_entity_recycle_problem

Fixes issue causing exception when entities start getting recycled