Aula 39 - fixed #14