Fix for checkout