Fixed removal failure bug