diff --git a/lib/src/form/src/form_value_wrapper.dart b/lib/src/form/src/form_value_wrapper.dart
index 134102e..9fb157f 100644
--- a/lib/src/form/src/form_value_wrapper.dart
+++ b/lib/src/form/src/form_value_wrapper.dart
@@ -23,7 +23,7 @@ class FormValueWrapper<T extends Object?> extends StatefulWidget {
   final AstromicFormController controller;
   final String id;
   final bool isRequired;
-  final Widget Function(T? value, bool isErroredForValidation, void Function(T value) valueSetter, VoidCallback valueClear) builder;
+  final Widget Function(T? value, bool isErroredForValidation, void Function(T? value) valueSetter, VoidCallback valueClear) builder;
   //!SECTION
   //
   const FormValueWrapper({
@@ -109,7 +109,7 @@ class _FormValueWrapperState<T> extends State<FormValueWrapper<T>> {
         stream: widget.controller.hostedValueValidationStream,
         builder: (BuildContext context, AsyncSnapshot<(String, bool)> validationSnapshot) {
           return widget.builder(widget.controller.getValue<T>(widget.id),
-              validationSnapshot.hasData && validationSnapshot.data != null && validationSnapshot.data!.$1 == widget.id && validationSnapshot.data!.$2 ? true : false, (T newValue) {
+              validationSnapshot.hasData && validationSnapshot.data != null && validationSnapshot.data!.$1 == widget.id && validationSnapshot.data!.$2 ? true : false, (T? newValue) {
             return widget.controller.setValue(widget.id, newValue);
           }, () => widget.controller.removeValue(widget.id));
         });