Fixed bug in Match