fixed match bugs
Merge branch 'local'