Issue 23 fix, transaction duplicate fix