Fixed match method.
add test
add test