fixing domain token (final)