Fixed: checkpoint tag can be built at earlier position