diff --git a/library/Facebook/base_facebook.php b/library/Facebook/base_facebook.php
index b7278ed..a8ce550 100755
--- a/library/Facebook/base_facebook.php
+++ b/library/Facebook/base_facebook.php
@@ -392,8 +392,7 @@ public function setExtendedAccessToken() {
       return false;
     }
 
-    $response_params = array();
-    parse_str($access_token_response, $response_params);
+    $response_params = json_decode($access_token_response, true);
 
     if (!isset($response_params['access_token'])) {
       return false;
@@ -804,8 +803,7 @@ protected function getAccessTokenFromCode($code, $redirect_uri = null) {
       return false;
     }
 
-    $response_params = array();
-    parse_str($access_token_response, $response_params);
+    $response_params = json_decode($access_token_response, true);
     if (!isset($response_params['access_token'])) {
       return false;
     }