#87 , UML fixed