Change the order of packages to hopefully fix the header issue