diff --git a/surveillance/mac_prises/mac_prise.py b/surveillance/mac_prises/mac_prise.py
index 962b0108..00a88405 100755
--- a/surveillance/mac_prises/mac_prise.py
+++ b/surveillance/mac_prises/mac_prise.py
@@ -30,6 +30,7 @@ def host_exists(hostname):
         socket.gethostbyname(hostname)
     except socket.gaierror:
         return False
+    return True
 
 def liste_chambres_macs(switch, annuaire):
     u'''
@@ -40,7 +41,7 @@ def liste_chambres_macs(switch, annuaire):
     '''
     liste_bats = ['a', 'b', 'c', 'g', 'h', 'i', 'j', 'm', 'p']
 
-    split = switch.replace('.adm.crans.org', '').split('-')
+    split = switch.split(".")[0].split('-')
     bat, num_switch = split[0][-1], int(split[1][0])
     if bat not in liste_bats:
         return {}
diff --git a/surveillance/mac_prises/mac_prise_holder.py b/surveillance/mac_prises/mac_prise_holder.py
index ce9b56c3..d84cba8e 100755
--- a/surveillance/mac_prises/mac_prise_holder.py
+++ b/surveillance/mac_prises/mac_prise_holder.py
@@ -76,7 +76,7 @@ if __name__ == '__main__':
     # parallélise vraiment !
     for switch in switches:
         output[switch] = threads[switch].output()
-    
+
     curseur = get_curseur(time.time())
 
     requete = "INSERT INTO correspondance (date, chambre, mac) VALUES (%s, %s, %s);"