Fix CheckPoint layout #1