diff --git a/bob/bio/base/script/evaluate.py b/bob/bio/base/script/evaluate.py
index eecc37be04fcb1f78c2345ac04950f72c897a473..734118fbd32658e5d9fafef5c4e316f8221f1870 100644
--- a/bob/bio/base/script/evaluate.py
+++ b/bob/bio/base/script/evaluate.py
@@ -121,7 +121,7 @@ def _plot_roc(frrs, colors, labels, title, fontsize=18, position=None, farfrrs=N
   pyplot.grid(True, color=(0.6,0.6,0.6))
   pyplot.legend(loc=position, prop = {'size':fontsize})
   pyplot.title(title)
-  pyplot.tight_layout()
+  figure.set_tight_layout(True)
 
   return figure
 
@@ -147,7 +147,7 @@ def _plot_det(dets, colors, labels, title, fontsize=18, position=None):
   pyplot.ylabel('FNMR (%)')
   pyplot.legend(loc=position, prop = {'size':fontsize})
   pyplot.title(title)
-  pyplot.tight_layout()
+  figure.set_tight_layout(True)
 
   return figure
 
@@ -194,7 +194,7 @@ def _plot_epc(scores_dev, scores_eval, colors, labels, title, fontsize=18, posit
   pyplot.title(title)
   pyplot.xlim([-0.01, 1.01])
   pyplot.ylim([0, 51])
-  pyplot.tight_layout()
+  figure.set_tight_layout(True)
 
   return figure