diff --git a/tiramisu/option/optiondescription.py b/tiramisu/option/optiondescription.py
index b73a6ae..37ad394 100644
--- a/tiramisu/option/optiondescription.py
+++ b/tiramisu/option/optiondescription.py
@@ -95,15 +95,15 @@ class CacheOptionDescription(BaseOption):
                     properties = option.impl_getproperties()
                     if 'force_store_value' in properties:
                         force_store_values.append(option)
-                    if __debug__ and ('force_default_on_freeze' in properties or \
-                            'force_metaconfig_on_freeze' in properties) and \
-                            'frozen' not in properties and \
-                            option.impl_is_leader():
-                        raise ConfigError(_('a leader ({0}) cannot have '
-                                            '"force_default_on_freeze" or '
-                                            '"force_metaconfig_on_freeze" '
-                                            'property without "frozen"'
-                                            '').format(option.impl_get_display_name()))
+#                    if __debug__ and ('force_default_on_freeze' in properties or \
+#                            'force_metaconfig_on_freeze' in properties) and \
+#                            'frozen' not in properties and \
+#                            option.impl_is_leader():
+#                        raise ConfigError(_('a leader ({0}) cannot have '
+#                                            '"force_default_on_freeze" or '
+#                                            '"force_metaconfig_on_freeze" '
+#                                            'property without "frozen"'
+#                                            '').format(option.impl_get_display_name()))
             if option.impl_is_readonly():
                 raise ConflictError(_('duplicate option: {0}').format(option))
             if not self.impl_is_readonly() and display_name: