fixed more issue changed header