Fixes matching after typechecking
Merge pull request #6 from densh/master

Fixes matching after typechecking