Resolve double header bug