possibly fixed deletion issues