Faulty handling on removed