Hacked the tnid issue in dev branch