Fixed the way we choose flavors