Vouchers and coupons fix