Multiple header fix