Fixed problem with deleted entries