diff --git a/ganimation/attacks.py b/ganimation/attacks.py
index 05ffacb..5860d51 100644
--- a/ganimation/attacks.py
+++ b/ganimation/attacks.py
@@ -31,8 +31,7 @@ class LinfPGDAttack(object):
 
             self.model.zero_grad()
             # loss = -self.loss_fn(output_att, y) + self.loss_fn(output_img, y)
-            # loss = self.loss_fn(output_att, y)
-            loss = self.loss_fn(output_att, y)
+            loss = -self.loss_fn(out, y)
             loss.backward()
             grad = X.grad
 
diff --git a/ganimation/solver.py b/ganimation/solver.py
index dfffe46..76af574 100644
--- a/ganimation/solver.py
+++ b/ganimation/solver.py
@@ -436,10 +436,10 @@ class Solver(Utils):
                                                                    image_path.split('/')[-1].split('.')[0]
                                                                    + '_ref.jpg'))
 
-                    l1_error += F.l1_loss(resulting_image, gen_noattack)
-                    l2_error += F.mse_loss(resulting_image, gen_noattack)
-                    l0_error += (resulting_image - gen_noattack).norm(0)
-                    min_dist += (resulting_image - gen_noattack).norm(float('-inf'))
+                    l1_error += F.l1_loss(resulting_image, resulting_image_noattack)
+                    l2_error += F.mse_loss(resulting_image, resulting_image_noattack)
+                    l0_error += (resulting_image - resulting_image_noattack).norm(0)
+                    min_dist += (resulting_image - resulting_image_noattack).norm(float('-inf'))
                     n_samples += 1
 
             # Print metrics