Fixes support for voucher claim