Bugfix Checkpoint