Fix to avoid the match variable to improve performance