diff --git a/src/main/java/io/appium/java_client/AppiumDriver.java b/src/main/java/io/appium/java_client/AppiumDriver.java
index 01eaaed4d..1e54423fe 100644
--- a/src/main/java/io/appium/java_client/AppiumDriver.java
+++ b/src/main/java/io/appium/java_client/AppiumDriver.java
@@ -689,8 +689,8 @@ public URL getRemoteAddress() {
      * @return a map with values that hold session details.
      *
      */
-    public Map<String, String> getSessionDetails() {
+    public Map<String, Object> getSessionDetails() {
         Response response = execute(GET_SESSION);
-        return (Map<String, String>) response.getValue();
+        return (Map<String, Object>) response.getValue();
     }
 }
diff --git a/src/test/java/io/appium/java_client/android/AndroidDriverTest.java b/src/test/java/io/appium/java_client/android/AndroidDriverTest.java
index 0dfc88f6b..26f88bdfb 100644
--- a/src/test/java/io/appium/java_client/android/AndroidDriverTest.java
+++ b/src/test/java/io/appium/java_client/android/AndroidDriverTest.java
@@ -18,10 +18,10 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-
 import io.appium.java_client.AppiumSetting;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.io.FileUtils;
@@ -30,6 +30,7 @@
 import org.openqa.selenium.html5.Location;
 
 import java.io.File;
+import java.util.Map;
 
 public class AndroidDriverTest extends BaseAndroidTest {
 
@@ -138,7 +139,12 @@ public class AndroidDriverTest extends BaseAndroidTest {
     }
 
     @Test public void getDeviceUDIDTest() {
-        String deviceSerial = driver.getSessionDetails().get("deviceUDID");
+        String deviceSerial = driver.getSessionDetails().get("deviceUDID").toString();
         assertNotNull(deviceSerial);
     }
+
+    @Test public void getSessionMapData() {
+        Map<?,?> map = (Map<?, ?>) driver.getSessionDetails().get("desired");
+        assertNotEquals(map.size(), 0);
+    }
 }