diff --git a/GAE/src/org/waterforpeople/mapping/dao/SurveyInstanceDAO.java b/GAE/src/org/waterforpeople/mapping/dao/SurveyInstanceDAO.java
index b5986e9737..dbc85fa210 100644
--- a/GAE/src/org/waterforpeople/mapping/dao/SurveyInstanceDAO.java
+++ b/GAE/src/org/waterforpeople/mapping/dao/SurveyInstanceDAO.java
@@ -173,7 +173,7 @@ public SurveyInstance save(Date collectionDate, DeviceFiles deviceFile,
 					}
 					si.setSurveyId(Long.parseLong(parts[0].trim()));
 					if (parts.length >= 12) {
-						String uuid = parts[parts.length - 1];
+						String uuid = parts[11];
 						if (uuid != null && uuid.trim().length() > 0) {
 							SurveyInstance existingSi = findByUUID(uuid);
 							if (existingSi != null) {