Fixed headers wrt previous commit