Fix for checkout issue