diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb
--- a/app/controllers/main_controller.rb
+++ b/app/controllers/main_controller.rb
@@ -83,13 +83,8 @@
   def source
     submission = Submission.find(params[:id])
     if submission.user_id == session[:user_id]
-      if submission.problem.output_only
-        fname = submission.source_filename
-      else
-        fname = submission.problem.name + '.' + submission.language.ext
-      end
       send_data(submission.source, 
-		{:filename => fname, 
+		{:filename => submission.download_filename, 
                   :type => 'text/plain'})
     else
       flash[:notice] = 'Error viewing source'