Fix issue handling callbacks

Now handling 1 to N transactions.  We were blowing up on 1 transaction.