bug fix. can disable
Merge branch 'use_matchaddpos'