Issue #240 , fix UML