Diagrams fixed