This could fix the header problem, but no way to test…