Risolve la issue #2