Tentativa de resolver Issue #4