diff --git a/src/main/java/org/gcube/portlets/widgets/mpformbuilder/shared/GenericDatasetBean.java b/src/main/java/org/gcube/portlets/widgets/mpformbuilder/shared/GenericDatasetBean.java
index a2c316f..b3ed0c6 100644
--- a/src/main/java/org/gcube/portlets/widgets/mpformbuilder/shared/GenericDatasetBean.java
+++ b/src/main/java/org/gcube/portlets/widgets/mpformbuilder/shared/GenericDatasetBean.java
@@ -79,7 +79,7 @@ public class GenericDatasetBean implements Serializable {
 	 *
 	 * @return the form data entry fields
 	 */
-	public Map<String, List<String>> getFormDataEntryFields() {
+	public LinkedHashMap<String, List<String>> getFormDataEntryFields() {
 		return formDataEntryFields;
 	}