fix FO checkout