Merge pull request #1113 from yousong/fix