added robustness under header misspecification