diff --git a/deepspeech/training/trainer.py b/deepspeech/training/trainer.py
index 246175e3..6563e7c4 100644
--- a/deepspeech/training/trainer.py
+++ b/deepspeech/training/trainer.py
@@ -266,8 +266,8 @@ class Trainer():
 
         self.checkpoint_dir = checkpoint_dir
 
-        self.checkpoint = KBestCheckpoint(max_size=self.config.training.max_epoch, 
-                            last_size=self.config.training.last_epoch)
+        self.checkpoint = KBestCheckpoint(max_size=self.config.training.checkpoint.kbest_n, 
+                            last_size=self.config.training.checkpoint.latest_n)
 
     @mp_tools.rank_zero_only
     def destory(self):
diff --git a/examples/tiny/s0/conf/deepspeech2.yaml b/examples/tiny/s0/conf/deepspeech2.yaml
index 9ff6803d..b9c2556c 100644
--- a/examples/tiny/s0/conf/deepspeech2.yaml
+++ b/examples/tiny/s0/conf/deepspeech2.yaml
@@ -49,8 +49,9 @@ training:
   weight_decay: 1e-06
   global_grad_clip: 5.0
   log_interval: 1
-  max_epoch: 3
-  last_epoch: 2
+  checkpoint:
+    kbest_n: 3
+    latest_n: 2
 
 
 decoding: