Fix #96. Now internal and external trans id are saved and used properly