Fix/1425 headings