diff --git a/Changes b/Changes
index f1b311d..1722f65 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,7 @@
 Revision history for {{$dist->name}}
 
 {{$NEXT}}
+ - Fix ::Row::SelfResultSet to correctly include CSA (Thanks Steve Kleiman!)
 
 2.023004  2014-08-01 18:27:54-05:00 America/Chicago
  - Fix implementation of ::Row::SelfResultSet (fixes GH#34, thanks ribasushi for
diff --git a/lib/DBIx/Class/Helper/Row/SelfResultSet.pm b/lib/DBIx/Class/Helper/Row/SelfResultSet.pm
index 4ac8bd6..dc3ba62 100644
--- a/lib/DBIx/Class/Helper/Row/SelfResultSet.pm
+++ b/lib/DBIx/Class/Helper/Row/SelfResultSet.pm
@@ -9,7 +9,7 @@ sub self_rs {
    my ($self) = @_;
 
    my $rs = $self->result_source->resultset;
-   return $rs->search($self->ident_condition)
+   return $rs->search( $self->ident_condition( $rs->current_source_alias ) );
 }
 
 1;