Moved flag_match back into private