diff --git a/edit-mode/function/ganttConfig.js b/edit-mode/function/ganttConfig.js
index d8dad8c..a9f9410 100644
--- a/edit-mode/function/ganttConfig.js
+++ b/edit-mode/function/ganttConfig.js
@@ -205,7 +205,7 @@ function addWithParent(id) {
 		id: no,
 		text: `New Activity`,
 		start_date: start_date,
-		duration: 1
+		duration: 0
 	}, id);
 
 	no = no + 1;
diff --git a/edit-mode/function/restActivityLink.js b/edit-mode/function/restActivityLink.js
index e80a689..5f4b219 100644
--- a/edit-mode/function/restActivityLink.js
+++ b/edit-mode/function/restActivityLink.js
@@ -61,7 +61,8 @@ var dp = gantt.createDataProcessor(function(entity, action, data, id) {
                 data['proyek_id'] = proyekId;
                 //TODO : Possible end date bug
                 data['start_date'] = `${data.start_date}+07`;
-                data['end_date'] = `${data.start_date}`;
+                let endDate = moment(data.end_date, "YYYY-MM-DD");
+                data['end_date'] = endDate.format("YYYY-MM-DD")+" 23:59:59+07";
 
                 if(data && data.parent){
                     data['parent_id'] = data.parent;
@@ -91,7 +92,7 @@ var dp = gantt.createDataProcessor(function(entity, action, data, id) {
 				let startDate = moment(data.start_date, "YYYY-MM-DD");
 				// data['start_date'] = startDate.format("YYYY-MM-DD")+" 00:00:00+07";
 				let endDate = moment(data.end_date, "YYYY-MM-DD");
-				// data['end_date'] = endDate.format("YYYY-MM-DD")+" 23:59:59+07";
+				data['end_date'] = endDate.format("YYYY-MM-DD")+" 23:59:59+07";
 
 				if(startDate > endDate){
 					gantt.alert({