fix matches and should be good enough now