Fix voucher problem