issue #7 e issue #13