diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb
index 0a1702fa..02087e49 100644
--- a/lib/jekyll/static_file.rb
+++ b/lib/jekyll/static_file.rb
@@ -37,10 +37,14 @@ module Jekyll
     #
     # Returns destination file path.
     def destination(dest)
+      File.join(*[dest, destination_rel_dir, @name].compact)
+    end
+
+    def destination_rel_dir
       if @collection
-        File.join(*[dest, @dir.gsub(/\A_/, ''), @name].compact)
+        @dir.gsub(/\A_/, '')
       else
-        File.join(*[dest, @dir, @name].compact)
+        @dir
       end
     end