diff --git a/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java b/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
index cadb55bce7..9b669feed8 100644
--- a/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
+++ b/src/main/java/com/lambdaworks/redis/RedisCommandBuilder.java
@@ -1714,7 +1714,7 @@ public Command<K, V, String> clusterReset(boolean hard) {
     }
 
     public Command<K, V, Long> geoadd(K key, double longitude, double latitude, V member) {
-        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(latitude).add(longitude).addValue(member);
+        CommandArgs<K, V> args = new CommandArgs<K, V>(codec).addKey(key).add(longitude).add(latitude).addValue(member);
         return createCommand(GEOADD, new IntegerOutput<K, V>(codec), args);
     }
 
diff --git a/src/test/java/com/lambdaworks/redis/GeoCommandTest.java b/src/test/java/com/lambdaworks/redis/GeoCommandTest.java
index 8a3c4a87a6..e8d56c91c1 100644
--- a/src/test/java/com/lambdaworks/redis/GeoCommandTest.java
+++ b/src/test/java/com/lambdaworks/redis/GeoCommandTest.java
@@ -39,7 +39,8 @@ public void geoaddMultiWrongArgument() throws Exception {
     }
 
     protected void prepareGeo() {
-        redis.geoadd(key, 8.6638775, 49.5282537, "Weinheim", 8.3796281, 48.9978127, "EFS9", 8.665351, 49.553302, "Bahn");
+        redis.geoadd(key, 8.6638775, 49.5282537, "Weinheim");
+        redis.geoadd(key, 8.3796281, 48.9978127, "EFS9", 8.665351, 49.553302, "Bahn");
     }
 
     @Test