[2013] Header fix attempt take two