fix bug
fix bug
fix bug #merge chlinyxf