Fixed removal on client side