fixed some matching