Solved remove bug