diff --git a/asmodee.py b/asmodee.py
index e64a9ba..3ed8770 100755
--- a/asmodee.py
+++ b/asmodee.py
@@ -579,7 +579,7 @@ def echo_callback(room, event):
 
 def liste(room, event):
     res = []
-	
+    
     members = room.get_joined_members()
     nick = ""
     try:
@@ -587,17 +587,22 @@ def liste(room, event):
         nick = [user.get_friendly_name() for user in members if user.user_id == event['sender']][0]
     except:
         nick = "Voisin du dessus"
-	
+    
     args = event['content']['body'].split()
     args.pop(0)
     try:
-        nb = int(args[1] if len(args) >= 2 else "1")
-        list = args[0].split('/')
+        nb = int(args[len(args)])
+        args.pop(len(args))
+    except:
+        nb = 1
+    args = ' '.join(args)
+    list = args[0].split('/')
+    if (nb <= len(list)):
         for i in range(nb):
             id = random.randrange(0,len(list))
             res.append(list.pop(list.index(id)))
         room.send_text(nick + "obtient :\n" + '\n'.join(res))
-    except:
+    else:
         room.send_text("Utilisation : !liste <options/de/la/liste> [nombre d elements]")
 
 
@@ -652,8 +657,8 @@ def main():
 
     carte_handler = MCommandHandler("carte", carte)
     bot.add_handler(carte_handler)
-	
-	# Un élément d'une liste
+    
+    # Un élément d'une liste
     liste_handler = MCommandHandler("liste", liste)
     bot.add_handler(liste_handler)