Fix bug 1867 - Use existing flavors with true