diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb
index 19ccd919eb3835d7a6c7bbc53f14097560045732..3a4e78286d7dd41843294e5cae8851254039e514 100644
--- a/app/controllers/aspects_controller.rb
+++ b/app/controllers/aspects_controller.rb
@@ -104,7 +104,7 @@ class AspectsController < ApplicationController
 
   def edit
     @aspect = current_user.aspects.where(:id => params[:id]).includes(:contacts => {:person => :profile}).first
-    @contacts = current_user.contacts.includes(:person => :profile).all.sort!{|x, y| x.person.profile.first_name <=> y.person.profile.first_name }.reverse!
+    @contacts = current_user.contacts.includes(:person => :profile).all.sort!{|x, y| x.person.name <=> y.person.name}.reverse!
     unless @aspect
       render :file => "#{Rails.root}/public/404.html", :layout => false, :status => 404
     else
diff --git a/spec/controllers/aspects_controller_spec.rb b/spec/controllers/aspects_controller_spec.rb
index 9a7f6ce21900797c65ed0490bc585f61466bd167..a2045961f5044480e01c7a50577291a4789ddb68 100644
--- a/spec/controllers/aspects_controller_spec.rb
+++ b/spec/controllers/aspects_controller_spec.rb
@@ -287,6 +287,9 @@ describe AspectsController do
     before do
       @bob = bob
       @eve = eve
+      @eve.profile.first_name = nil
+      @eve.profile.save
+      @eve.save
     end
     it 'renders' do
       get :edit, :id => @alices_aspect_1.id
@@ -297,7 +300,7 @@ describe AspectsController do
       connect_users(@alice, @alices_aspect_1, @eve, @eve.aspects.first)
       
       get :edit, :id => @alices_aspect_1.id
-      assigns[:contacts].should  == [@alice.contact_for(@bob.person), @alice.contact_for(@eve.person)]
+      assigns[:contacts].should == [@alice.contact_for(@eve.person), @alice.contact_for(@bob.person)]
     end
   end