Repair bad merge about the 8.0.0 version