bug fix
Merge branch 'use_matchaddpos'