Fix match() check and required