diff --git a/activerecord-sqlserver-adapter.gemspec b/activerecord-sqlserver-adapter.gemspec
index b626ca09c..32eb1c672 100644
--- a/activerecord-sqlserver-adapter.gemspec
+++ b/activerecord-sqlserver-adapter.gemspec
@@ -12,7 +12,6 @@ Gem::Specification.new do |s|
   
   s.files         = Dir['CHANGELOG', 'MIT-LICENSE', 'README.rdoc', 'lib/**/*' ]
   s.require_path  = 'lib'
-  s.has_rdoc      = true
   s.extra_rdoc_files = ['README.rdoc']
   s.rdoc_options.concat ['--main',  'README.rdoc']
   s.rubyforge_project = 'activerecord-sqlserver-adapter'
diff --git a/lib/arel/visitors/sqlserver.rb b/lib/arel/visitors/sqlserver.rb
index e1cc7d53c..3fe40263a 100644
--- a/lib/arel/visitors/sqlserver.rb
+++ b/lib/arel/visitors/sqlserver.rb
@@ -281,7 +281,7 @@ def rowtable_projections(o)
           core.projections.map do |x|
             x.dup.tap do |p|
               p.sub! 'DISTINCT', "DISTINCT #{visit(o.limit)}".strip if o.limit
-              p.sub! /\[#{tn}\]\./, '[__rnt].'
+              p.gsub! /\[?#{tn}\]?\./, '[__rnt].'
               p.strip!
             end
           end