corrigindo issues #37 #36