Fixed header skip bug