YY fix some bug.