diff --git a/py/bgtasks.py b/py/bgtasks.py
index 739ac6a..bdf6c7b 100644
--- a/py/bgtasks.py
+++ b/py/bgtasks.py
@@ -18,7 +18,7 @@ from libs.db.db_device import Devices,EXCLUDED,database
 import ipaddress
 import socket
 from libs.check_routeros.routeros_check.resource import RouterOSCheckResource
-from typing import Dict
+from typing import Dict 
 import json
 import datetime
 
@@ -344,7 +344,7 @@ def scan_with_ip(*args, **kwargs):
                     device['update_availble']=is_availbe
                     device['upgrade_availble']=upgrade_availble
                     device['current_firmware']=current
-                    device['mac']=result['interface']['mac-address']
+                    device['mac']=result['interface']['mac-address'] if "mac-address" in result['interface'] else 'tunnel'
                     device['name']=result['name']
                     device['details']=result['board-name'] + " " +  result['model'] if result['model']!=result['board-name'] else result['model']
                     device['uptime']=result['uptime']
diff --git a/py/libs/util.py b/py/libs/util.py
index f8fe949..7500512 100644
--- a/py/libs/util.py
+++ b/py/libs/util.py
@@ -5,6 +5,7 @@
 # MikroWizard.com , Mikrotik router management solution
 # Author: sepehr.ha@gmail.com
 
+from logging.config import IDENTIFIER
 import pytz
 import datetime
 import time
@@ -705,7 +706,10 @@ def backup_router(dev):
 def store_config(dev,configs):
     dir=config.BACKUP_DIR
     #add device mac and curent date to dir
-    dir=dir+dev.mac+"/"+datetime.datetime.now().strftime("%Y-%m-%d")+"/"
+    identifier=dev.mac
+    if identifier=='tunnel':
+        identifier=identifier+"_devid_"+(str(dev.id))
+    dir=dir+identifier+"/"+datetime.datetime.now().strftime("%Y-%m-%d")+"/"
     filename=datetime.datetime.now().strftime("%H-%M-%S")+".txt"
     filedir=dir+filename
     try: