add another fix to contain the match error message