bug with matching fixed