diff --git a/VERSION b/VERSION
index 8bcafaed..b17c58ba 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.0.9 (2012-09-24 11:50:52) stable
+Version 2.0.9 (2012-09-24 11:59:51) stable
diff --git a/gluon/main.py b/gluon/main.py
index 8d470579..e02a36f9 100644
--- a/gluon/main.py
+++ b/gluon/main.py
@@ -132,7 +132,7 @@ def get_client(env):
     """
     g = regex_client.search(env.get('http_x_forwarded_for', ''))
     if g:
-        client = g.group()
+        client = (g.group() or '').split(',')[0]
     else:
         g = regex_client.search(env.get('remote_addr', ''))
         if g: