Fix crashing.
Checkpoint.