Issue #79, Fix UML