diff --git a/merb-freezer/lib/merb-freezer/freezer.rb b/merb-freezer/lib/merb-freezer/freezer.rb
index e3b43aa..b3bae1d 100644
--- a/merb-freezer/lib/merb-freezer/freezer.rb
+++ b/merb-freezer/lib/merb-freezer/freezer.rb
@@ -58,7 +58,12 @@ class Freezer
       else
         @mode = 'rubygems'
       end
-      @freezer_dir = framework_component? ? Freezer.framework_dir : Freezer.gems_dir
+      
+      if @mode == 'submodules'
+        @freezer_dir = Freezer.framework_dir
+      elsif @mode == 'rubygems'
+        @freezer_dir = Freezer.gems_dir
+      end
     end
     
     # Calls the freezer mode on the component
@@ -73,4 +78,4 @@ class Freezer
       Freezer.components.keys.include?(@component.gsub("merb-", ""))
     end
 
-end
\ No newline at end of file
+end
diff --git a/merb-freezer/lib/merb-freezer/freezer_mode.rb b/merb-freezer/lib/merb-freezer/freezer_mode.rb
index 2556db2..a26cab1 100644
--- a/merb-freezer/lib/merb-freezer/freezer_mode.rb
+++ b/merb-freezer/lib/merb-freezer/freezer_mode.rb
@@ -53,7 +53,7 @@ module FreezerMode
     create_freezer_dir(freezer_dir)
     action = update ? 'update' : 'install'
     puts "#{action} #{@component} and dependencies from rubygems"
-    `#{sudo} gem #{action} #{@component} --no-rdoc --no-ri -i #{framework_component? ? 'framework' : 'gems'}`
+    `#{sudo} gem #{action} #{@component} --no-rdoc --no-ri -i #{freezer_dir}`
   end
   
   def create_freezer_dir(path)
@@ -82,4 +82,4 @@ module FreezerMode
     !$?.nil? && $?.success?
   end
   
-end
\ No newline at end of file
+end