Diagram fixed
Table fixed