diff --git a/changelogs/0.1.1.txt b/changelogs/0.1.1.txt
index 74bebde..1744f1c 100644
--- a/changelogs/0.1.1.txt
+++ b/changelogs/0.1.1.txt
@@ -71,3 +71,4 @@ Glen reworked
 GLLogger \n bug fix
 Removed text size limit in Ed Message
 Rewrited Linux build scripts
+Big performance fix
\ No newline at end of file
diff --git a/scripts/Data_Settings_Classes.rb b/scripts/Data_Settings_Classes.rb
index 2bef4cf..4b35d1b 100644
--- a/scripts/Data_Settings_Classes.rb
+++ b/scripts/Data_Settings_Classes.rb
@@ -318,7 +318,7 @@ class Window_Settings
     end
 
     def value
-      if (Settings.has?(@parameter))
+      if @parameter && Settings.has?(@parameter)
         @value = Settings[@parameter]
       end
       @value
diff --git a/scripts/Window_Settings.rb b/scripts/Window_Settings.rb
index 3b2143f..275c6d3 100644
--- a/scripts/Window_Settings.rb
+++ b/scripts/Window_Settings.rb
@@ -91,7 +91,7 @@ class Window_Settings
               parameter_info[:name], parameter_info[:parameter], parameter_info[:default], parameter_info[:step], parameter_info[:min], parameter_info[:max]))
           when :enum
             @content.add_parameter(screen_title, EnumParameter.new(@content, screen_index, parameter_index,
-              parameter_info[:name], parameter_info[:parameter], 0, parameter_info[:values]))
+              parameter_info[:name], parameter_info[:parameter], parameter_info[:default], parameter_info[:values]))
           when :sep
             @content.add_parameter(screen_title, Separator.new(@content, screen_index, parameter_index,
               parameter_info[:name]))