Fix to handle matching {ok, match} correctly