latest code handles bjt tags better