diff --git a/psydac/linalg/solvers.py b/psydac/linalg/solvers.py
index 862868ea2..0a72d226f 100644
--- a/psydac/linalg/solvers.py
+++ b/psydac/linalg/solvers.py
@@ -1007,7 +1007,7 @@ def solve(self, b, out=None):
             pp += rp
 
             # new residual norm
-            res_sqr = r.dot(r)
+            res_sqr = r.dot(r).real
 
             niter += 1
 
@@ -1804,6 +1804,10 @@ def solve(self, b, out=None):
         r -= b
 
         am = sqrt(r.dot(r).real)
+        if am < tol:
+            self._info = {'niter': 1, 'success': am < tol, 'res_norm': am }
+            return x
+
         beta.append(am)
         r *= - 1 / am