Merge pull request #1654 from apache/fix_exceed_limit