#44 Fix transaction problem