Events are lost when using remove and add at the same timr

[alexjpaz]

The persist event is triggered twice which causes a race condition on what data is saved. This may cause a loss in data.