Fixed header related bug