Fix WithTransaction