corretta Issue #37 e Issue #36