fixed yushi's errors