Try to fix particular cases in deletion