Revert "Revert "07/08 - Correções II""

This reverts commit a9b3eebba0d03734b08272bf387b120ff87e2bc3.
Revert "Revert "Revert "07/08 - Correções II"""

This reverts commit bf9e7579aa59ac6fa931d56e4abb003969e71692.