Fixed edge case for comments checkpoint