fix bug and dis on 201408221818