diff --git a/app/views/shared/_stream.haml b/app/views/shared/_stream.haml
index 5595513c2..78f68d228 100644
--- a/app/views/shared/_stream.haml
+++ b/app/views/shared/_stream.haml
@@ -4,8 +4,13 @@
 
 
 - if posts.length > 0
-  - for post in posts
+  -# for post in posts
     = render 'shared/stream_element', :post => post, :all_aspects => @all_aspects, :commenting_disabled => defined?(@commenting_disabled)
+  = render :partial => 'shared/stream_element',
+           :collection => posts,
+           :as => :post,
+           :locals => {:all_aspects => @all_aspects,
+             :commenting_disabled => defined?(@commenting_disabled)}
 
 - else
   = render 'aspects/no_posts_message', :post_count => posts.length
diff --git a/lib/fake.rb b/lib/fake.rb
index bb0475cdc..27a502de6 100644
--- a/lib/fake.rb
+++ b/lib/fake.rb
@@ -1,13 +1,10 @@
 class PostsFake
   attr_reader :people_hash, :post_fakes
-
-  def method_missing(method, *args, &block)
-    @post_fakes.send(method, *args, &block)
-  end
+  delegate :length, :each, :to_ary, :to => :post_fakes
 
   def initialize(posts)
     person_ids = []
-    posts.each do |p| 
+    posts.each do |p|
       person_ids << p.person_id
       p.comments.each do |c|
         person_ids << c.person_id
@@ -19,9 +16,9 @@ class PostsFake
     people.each{|person| @people_hash[person.id] = person}
 
     @post_fakes = posts.map do |post|
-      f = Fake.new(post, self) 
+      f = Fake.new(post, self)
       f.comments = post.comments.map do |comment|
-        Fake.new(comment, self) 
+        Fake.new(comment, self)
       end
       f
     end