Fix white spaces causing header issues