fix header message issues