Fix crash remove