Update for X header issue