Bug fix related to control delete