diff --git a/src/com/activeandroid/ModelInfo.java b/src/com/activeandroid/ModelInfo.java
index 09e79117c..a3d4a7ddb 100644
--- a/src/com/activeandroid/ModelInfo.java
+++ b/src/com/activeandroid/ModelInfo.java
@@ -32,6 +32,7 @@
 import com.activeandroid.serializer.CalendarSerializer;
 import com.activeandroid.serializer.SqlDateSerializer;
 import com.activeandroid.serializer.TypeSerializer;
+import com.activeandroid.serializer.UUIDSerializer;
 import com.activeandroid.serializer.UtilDateSerializer;
 import com.activeandroid.serializer.FileSerializer;
 import com.activeandroid.util.Log;
@@ -50,6 +51,7 @@ final class ModelInfo {
 			put(java.sql.Date.class, new SqlDateSerializer());
 			put(java.util.Date.class, new UtilDateSerializer());
 			put(java.io.File.class, new FileSerializer());
+            put(java.util.UUID.class, new UUIDSerializer());
 		}
 	};
 
diff --git a/src/com/activeandroid/query/From.java b/src/com/activeandroid/query/From.java
index ab3837a90..41fe11b82 100644
--- a/src/com/activeandroid/query/From.java
+++ b/src/com/activeandroid/query/From.java
@@ -22,6 +22,7 @@
 import com.activeandroid.Model;
 import com.activeandroid.content.ContentProvider;
 import com.activeandroid.query.Join.JoinType;
+import com.activeandroid.serializer.TypeSerializer;
 import com.activeandroid.util.Log;
 import com.activeandroid.util.SQLiteUtils;
 
@@ -338,7 +339,13 @@ public String[] getArguments() {
 		final String[] args = new String[size];
 
 		for (int i = 0; i < size; i++) {
-			args[i] = mArguments.get(i).toString();
+            TypeSerializer serializer = Cache.getParserForType(mArguments.get(i).getClass());
+
+            if(serializer==null) args[i] = mArguments.get(i).toString();
+            else  args[i] = serializer.serialize(mArguments.get(i)).toString();
+
+            // original action
+            // args[i] = mArguments.get(i).toString();
 		}
 
 		return args;