diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/geoloc/packet/GeoLocation.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/geoloc/packet/GeoLocation.java
index d868e7a8f..0bda4585e 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/geoloc/packet/GeoLocation.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/geoloc/packet/GeoLocation.java
@@ -211,24 +211,24 @@ public class GeoLocation implements Serializable, ExtensionElement {
     public CharSequence toXML() {
         XmlStringBuilder xml = new XmlStringBuilder(this);
         xml.rightAngleBracket();
-        xml.optElement("accuracy", String.valueOf(accuracy));
-        xml.optElement("alt", String.valueOf(alt));
+        xml.optElement("accuracy", accuracy);
+        xml.optElement("alt", alt);
         xml.optElement("area", area);
-        xml.optElement("bearing", String.valueOf(bearing));
+        xml.optElement("bearing", bearing);
         xml.optElement("building", building);
         xml.optElement("country", country);
         xml.optElement("countrycode", countryCode);
         xml.optElement("datum", datum);
         xml.optElement("description", description);
-        xml.optElement("error", String.valueOf(error));
+        xml.optElement("error", error);
         xml.optElement("floor", floor);
-        xml.optElement("lat", String.valueOf(lat));
+        xml.optElement("lat", lat);
         xml.optElement("locality", locality);
-        xml.optElement("lon", String.valueOf(lon));
+        xml.optElement("lon", lon);
         xml.optElement("postalcode", postalcode);
         xml.optElement("region", region);
         xml.optElement("room", room);
-        xml.optElement("speed", String.valueOf(speed));
+        xml.optElement("speed", speed);
         xml.optElement("street", street);
         xml.optElement("text", text);
         xml.optElement("timestamp", timestamp);