Fixed #122, update the transaction after create new one
Merge from origin master