11/18 Bug on deletion remained