improved fix for dublicatedTransactions
Merge branch 'hotfix/dublicateOrders'