Fix match return of non successful match results