Headers correction, without test