Fixed removal on update