Fix previous commit ( cd74fc31cf47155e587230e6ec8314685091bc12) : double-delete and an un-initialized variable