[yanan] bugs fixed