fix bug.Check out master branch for the detail.