Fix match_key