diff --git a/helios_auth/auth_systems/facebook.py b/helios_auth/auth_systems/facebook.py
index 8a0b03bf50c500f29c34b26eadea7b7a0602d6ac..4c50c6594336f60c2999303c57088e6feeb77b4c 100644
--- a/helios_auth/auth_systems/facebook.py
+++ b/helios_auth/auth_systems/facebook.py
@@ -53,7 +53,7 @@ def get_user_info_after_auth(request):
       'code' : request.GET['code']
       })
 
-  access_token = cgi.parse_qs(args)['access_token'][0]
+  access_token = utils.from_json(args)['access_token']
 
   info = utils.from_json(facebook_get('/me', {'access_token':access_token}))