Contrato Class fixed #5