Fixes event order on update bug