Fixes issue as described by #107 for PaymentTagHandler