Resolvida issue #9