Fix checkout mechanism