#18 issues solucionado