diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
index c3ec4f47..e894acb5 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
@@ -495,27 +495,24 @@ public class ApplicationDao {
         VersionActionTypeEnum actionType = VersionActionTypeEnum.INSERT;
         List<ContentResponseBean> contentResponseBeans = formDao.convertFormEntityToFormResponseBean(formEntity).getContent();
 
-        contentResponseBeans.stream()
-                .filter(content -> "numberinput".equals(content.getName()))
-                .map(ContentResponseBean::getSettings)
-                .flatMap(List::stream)
-                .filter(setting -> "isRequestedAmount".equals(setting.getName()) && Boolean.TRUE.equals(setting.getValue()))
-                .findFirst()
-                .ifPresent(setting -> {
-                    Object fieldValue = applicationFormFieldRequestBean.getFieldValue();
-                    if(fieldValue!=null) {
-                        if (fieldValue instanceof String) {
-                            try {
-                                BigDecimal amountRequested = new BigDecimal((String) fieldValue);
-                                applicationFormEntity.getApplication().setAmountRequested(amountRequested);
-                            } catch (NumberFormatException e) {
-                                throw new IllegalArgumentException("Field value is not a valid number: " + fieldValue, e);
-                            }
-                        } else {
-                            throw new IllegalArgumentException("Field value is not a String: " + fieldValue);
-                        }
-                    }
-                });
+	        contentResponseBeans.stream()
+	                .filter(content -> "numberinput".equals(content.getName()) && content.getId().toString().equals(applicationFormFieldRequestBean.getFieldId()))
+	                .map(ContentResponseBean::getSettings)
+	                .flatMap(List::stream)
+	                .filter(setting -> "isRequestedAmount".equals(setting.getName()) && Boolean.TRUE.equals(setting.getValue()))
+	                .findFirst()
+	                .ifPresent(setting -> {
+	                	
+	                    Object fieldValue = applicationFormFieldRequestBean.getFieldValue();
+	                    if(fieldValue!=null) {
+	                            try {
+	                                BigDecimal amountRequested = new BigDecimal(fieldValue.toString());
+	                                applicationFormEntity.getApplication().setAmountRequested(amountRequested);
+	                            } catch (NumberFormatException e) {
+	                                throw new IllegalArgumentException("Field value is not a valid number: " + fieldValue, e);
+	                            }
+	                    }
+	                });
 
 
         ApplicationFormFieldEntity oldApplicationFormFieldData = null;