diff --git a/lib/sass/script/lexer.rb b/lib/sass/script/lexer.rb
index 3d270382..24c8d182 100644
--- a/lib/sass/script/lexer.rb
+++ b/lib/sass/script/lexer.rb
@@ -149,10 +149,10 @@ module Sass
       # @return [Boolean]
       def whitespace?(tok = @tok)
         if tok
-          @scanner.string[0...tok.pos] =~ /\s$/
+          @scanner.string[0...tok.pos] =~ /\s\Z/
         else
           @scanner.string[@scanner.pos, 1] =~ /^\s/ ||
-            @scanner.string[@scanner.pos - 1, 1] =~ /\s$/
+            @scanner.string[@scanner.pos - 1, 1] =~ /\s\Z/
         end
       end
 
diff --git a/test/sass/scss/scss_test.rb b/test/sass/scss/scss_test.rb
index 24c5e316..a70a9690 100755
--- a/test/sass/scss/scss_test.rb
+++ b/test/sass/scss/scss_test.rb
@@ -970,6 +970,21 @@ SCSS
 flim {
   && {a: b}
 }
+SCSS
+  end
+
+  # Regression
+
+  def test_weird_added_space
+    assert_equal <<CSS, render(<<SCSS)
+foo {
+  bar: -moz-bip; }
+CSS
+$value : bip;
+
+foo {
+  bar: -moz-\#{$value};
+}
 SCSS
   end
 end