WIP: fixing weird behaviour around guestCheckout