Sergeanur Possible fix of RemoveAndAdd crash