Fixed Make2.0 Bug