Fixing header bug