Fix Bug1832-Use existing flavors with true