Issue #78, Fix UML