FIX duplication of voucher with checks