Fix bug 1866 - Use existing flavors with true