fix --external-tokens support