Added a GV guard and stop killing GV;