fix flavor matching