fix and checkpoint