Fixing Giuseppe's mistakes