Better handling for default flavor