fix severe (delete-related) Bug