Adds fix for guest checkouts