Fix simultaneous editing issue