Fix transaction boundary