Bugfix checkpoint