Refatorando 1158.
Resolvendo 1175.
Resolvendo 1159.