Fix enitity moving from original vector