Fix runaway delete
Work in progess..