Working on fix for bug in Delete()