diff --git a/ruby/lib/jam_ruby/models/jam_track_right.rb b/ruby/lib/jam_ruby/models/jam_track_right.rb
index fbd97bc78..35edf486f 100644
--- a/ruby/lib/jam_ruby/models/jam_track_right.rb
+++ b/ruby/lib/jam_ruby/models/jam_track_right.rb
@@ -87,8 +87,8 @@ module JamRuby
       end
 
       JamTrack.select('jam_tracks.id, jam_track_rights.private_key AS private_key, jam_track_rights.id AS jam_track_right_id')
-          .joins("LEFT OUTER JOIN jam_track_rights ON jam_tracks.id = jam_track_rights.jam_track_id AND jam_track_rights.user_id = '#{user.id}'")
-          .where('jam_tracks.id IN (?)', jamtracks)
+          .joins("LEFT OUTER JOIN jam_track_rights ON jam_tracks.id = jam_track_rights.jam_track_id")
+          .where('jam_tracks.id IN (?) AND jam_track_rights.user_id=?', jamtracks, user)
     end
     
   end
diff --git a/web/spec/controllers/api_jam_tracks_controller_spec.rb b/web/spec/controllers/api_jam_tracks_controller_spec.rb
index fab1c6fa9..b6ae5932b 100644
--- a/web/spec/controllers/api_jam_tracks_controller_spec.rb
+++ b/web/spec/controllers/api_jam_tracks_controller_spec.rb
@@ -124,13 +124,16 @@ describe ApiJamTracksController do
       response.status.should == 200
       json = JSON.parse(response.body)
       json.length.should == 1
+      puts json.inspect
       json[0]['id'].should == @jam_track.id
       json[0]['private'].should be_nil
       json[0]['error'].should == 'not_purchased'
     end
 
     it "track with no key" do
+
       right = FactoryGirl.create(:jam_track_right, user: @user, private_key: nil, jam_track: @jam_track)
+
       get :keys, jamtracks: [@jam_track.id]
       response.status.should == 200
       json = JSON.parse(response.body)