#5 Bug fix in Delete