fixing matches issue