shiyan7bug fixed