diff --git a/config/deploy.rb b/config/deploy.rb
index 98f2501..abcecd3 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -99,7 +99,17 @@ namespace :rake do
   desc "Run a task on a remote server."
   # run like: cap staging rake:invoke task=a_certain_task
   task :invoke do
-    run("cd #{deploy_to}/current; bin/rake RAILS_ENV=#{rails_env} rake #{ENV['task']}")
+    run("bin/rake RAILS_ENV=#{rails_env} rake #{ENV['task']}")
+  end
+end
+
+task :invoke, [:command] => 'deploy:set_rails_env' do |task, args|
+  on primary(:app) do
+    within current_path do
+      with :rails_env => fetch(:rails_env) do
+        rake args[:command]
+      end
+    end
   end
 end