fix suffix matching to remove the suffix