diff --git a/README.md b/README.md
index 5068777..48ccca3 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,7 @@ This plugin uses [FontAwesome icons](http://fontawesome.io/)
 
 ### Changelog
 
+* **v 0.6.3** : fixed Github issue #22 : DatepickerFallback raised an error
 * **v 0.6.2** : fixed Github issue #22 : long description is now supported (no more 414 errors)
 * **v 0.6.1** : fixed Github issue #20
 * **v 0.6.0** : NOW WITH CUSTOM FIELDS SUPPORT ! (Github #19)
diff --git a/assets/javascripts/issue_dynamic_edit.js b/assets/javascripts/issue_dynamic_edit.js
index 2a093ad..676dd95 100644
--- a/assets/javascripts/issue_dynamic_edit.js
+++ b/assets/javascripts/issue_dynamic_edit.js
@@ -118,7 +118,11 @@ function initEditFields()
 
 				if(info.field_format == "date")
 				{
-					$('body').find('#dynamic_issue_custom_field_values_' + info.id).datepickerFallback(datepickerOptions);
+					if(	$('body').find('#dynamic_issue_custom_field_values_' + info.id).length
+					    && $('body').find('#dynamic_issue_custom_field_values_' + info.id).datepickerFallback instanceof Function)
+					{
+						$('body').find('#dynamic_issue_custom_field_values_' + info.id).datepickerFallback(datepickerOptions);
+					}
 				}
 			}
 		}
@@ -261,7 +265,11 @@ function issueDynamicUpdate(field_name, field_value, type, cssClass){
 				}, 500);
 
 				//set datepicker fallback for input type date
-				$('body').find('input[type=date]').datepickerFallback(datepickerOptions);
+				if(	$('body').find('input[type=date]').length
+					&& $('body').find('input[type=date]').datepickerFallback instanceof Function)
+				{
+					$('body').find('input[type=date]').datepickerFallback(datepickerOptions);
+				}
 			
 		},
 	    error: function(xhr, msg, error) {
@@ -455,12 +463,7 @@ function initEditFieldListeners()
 				 {
 				 	var new_value = domInputField.val();
 			
-					if(typeof(CKEDITOR) === "object" 
-						&& typeof(CKEDITOR.instances['dynamic_issue_custom_field_values_' + info.id].getData) === typeof(Function)){
-						new_value = CKEDITOR.instances['dynamic_issue_custom_field_values_' + info.id].getData();
-					}
-
-			 		issueDynamicUpdate('custom_field_values_' + info.id , new_value, inputType, 'cf_' + info.id);
+					issueDynamicUpdate('custom_field_values_' + info.id , new_value, inputType, 'cf_' + info.id);
 					
 					return false;
 				 }); 
diff --git a/init.rb b/init.rb
index d6a7e09..6f90a0e 100644
--- a/init.rb
+++ b/init.rb
@@ -6,7 +6,7 @@ Redmine::Plugin.register :redmine_issue_dynamic_edit do
   name 'Redmine Dynamic edit Issue plugin'
   author 'Hugo Zilliox'
   description 'Allows users to dynamically update issue attributes in detailed view without refreshing the page (JIRA style)'
-  version '0.6.2'
+  version '0.6.3'
   url 'https://github.com/ilogeek/redmine_issue_dynamic_edit'
   author_url 'https://hzilliox.fr'
 end