Fix remove, event trigger order