Checkout BUG fix