0.1.12: dont add headers that are optional