Corrigida issue #17