Fixing double-header bug.