Fixed remove bug