Issue #94: checkpoint
Issue #94: proposed bugfix