Fixado issue #1