Adding bug fix for really bad delete server bug