Issue #234 Fix UML