Fixed header extract issue