diff --git a/package.json b/package.json
index 8b38120d..fbfc962d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ngx-mce/amc",
-  "version": "21.2.0",
+  "version": "21.2.1-next.1",
   "description": "Angular Material Components Example Application",
   "author": "Felipe B.",
   "repository": {
diff --git a/projects/color-picker/package.json b/projects/color-picker/package.json
index 34be4ee2..0c2c5340 100644
--- a/projects/color-picker/package.json
+++ b/projects/color-picker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ngx-mce/color-picker",
-  "version": "21.2.0",
+  "version": "21.2.1-next.1",
   "description": "Angular Material Color Picker",
   "author": "Felipe B.",
   "repository": {
diff --git a/projects/color-picker/src/lib/components/color-canvas/color-canvas.component.ts b/projects/color-picker/src/lib/components/color-canvas/color-canvas.component.ts
index ca84cf81..89506f0b 100644
--- a/projects/color-picker/src/lib/components/color-canvas/color-canvas.component.ts
+++ b/projects/color-picker/src/lib/components/color-canvas/color-canvas.component.ts
@@ -109,15 +109,17 @@ export class NgxMatColorCanvasComponent
   }
 
   ngOnChanges(changes: SimpleChanges): void {
-    if (changes['color'] && changes['color'].currentValue) {
-      this.updateForm(changes['color'].currentValue);
+    const key = "setColor";
+    
+    if (changes[key] && changes[key].currentValue) {
+      this.updateForm(changes[key].currentValue);
       if (this._resetBaseColor) {
-        this._baseColor = changes['color'].currentValue;
+        this._baseColor = changes[key].currentValue;
       }
 
       this._resetBaseColor = true;
 
-      if (!changes['color'].firstChange) {
+      if (!changes[key].firstChange) {
         this.draw();
       }
     }
@@ -125,6 +127,7 @@ export class NgxMatColorCanvasComponent
 
   private updateForm(val: Color): void {
     const config = { emitEvent: false };
+    
     this.rCtrl?.setValue(val.r, config);
     this.gCtrl?.setValue(val.g, config);
     this.bCtrl?.setValue(val.b, config);
diff --git a/projects/datetime-picker/package.json b/projects/datetime-picker/package.json
index 51c7aa74..c7946e3b 100644
--- a/projects/datetime-picker/package.json
+++ b/projects/datetime-picker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ngx-mce/datetime-picker",
-  "version": "21.2.0",
+  "version": "21.2.1-next.1",
   "description": "Angular Material Datetime Picker",
   "author": "Felipe B.",
   "repository": {
diff --git a/projects/file-input/package.json b/projects/file-input/package.json
index 50e7f6bb..90e6fc85 100644
--- a/projects/file-input/package.json
+++ b/projects/file-input/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ngx-mce/file-input",
-  "version": "21.2.0",
+  "version": "21.2.1-next.1",
   "description": "Angular Material File Input",
   "author": "Felipe B.",
   "repository": {