Fix transaction bug
Merge