fixes with vouchers