diff --git a/viewpump/src/main/java/dev/b3nedikt/viewpump/ViewPumpAppCompatDelegate.kt b/viewpump/src/main/java/dev/b3nedikt/viewpump/ViewPumpAppCompatDelegate.kt
index a5f2bd1..135ceac 100644
--- a/viewpump/src/main/java/dev/b3nedikt/viewpump/ViewPumpAppCompatDelegate.kt
+++ b/viewpump/src/main/java/dev/b3nedikt/viewpump/ViewPumpAppCompatDelegate.kt
@@ -188,15 +188,15 @@ class ViewPumpAppCompatDelegate @JvmOverloads constructor(
             "com.android.internal.widget.ButtonBarLayout" ->
                 ButtonBarLayout(createWrappedContext(), attrs)
 
-            // The following three widgets only exist on Samsung devices with android 9,
-            // we replace them with their counterparts from android.widgets
-            "com.android.internal.widget.CalendarView" ->
+            // The following three widgets are created incorrectly on Samsung devices with android 9,
+            // we therefor create them manually
+            "CalendarView" ->
                 CalendarView(createWrappedContext(), attrs)
 
-            "com.android.internal.widget.DatePicker" ->
+            "DatePicker" ->
                 DatePicker(createWrappedContext(), attrs)
 
-            "com.android.internal.widget.NumberPicker" ->
+            "NumberPicker" ->
                 NumberPicker(createWrappedContext(), attrs)
 
             else -> view