So we really need to keep repeating this for all headers. The above change should be enough, no?