diff --git a/lib/middleman/sass.rb b/lib/middleman/sass.rb
index 6832e0a6..7a9bf45a 100755
--- a/lib/middleman/sass.rb
+++ b/lib/middleman/sass.rb
@@ -15,7 +15,8 @@ module Middleman
           send_file(static_version) if File.exists? static_version
 
           location_of_sass_file = options.environment == "build" ? options.build_dir : options.public
-          css_filename = File.join(Dir.pwd, location_of_sass_file) + request.path_info
+          
+          css_filename = File.join(location_of_sass_file, request.path_info)
           sass(path.to_sym, ::Compass.sass_engine_options.merge({ :css_filename => css_filename }))
         rescue Exception => e
           sass_exception_string(e)
diff --git a/spec/fixtures/sample/views/custom.haml b/spec/fixtures/sample/views/custom.haml
old mode 100644
new mode 100755
diff --git a/spec/page_alias_and_layouts_spec.rb b/spec/page_alias_and_layouts_spec.rb
old mode 100644
new mode 100755