Fix GetHeaders