Fixed bug on matcher