Merge pull request #1135 from yousong/fix