Crash on delete fixed