Fix header compose