diff --git a/lib/sf/session.rb b/lib/sf/session.rb
index 90fcb07..d1c4af8 100644
--- a/lib/sf/session.rb
+++ b/lib/sf/session.rb
@@ -31,15 +31,15 @@ def proposal_attrs
     attrs['submitter_phone__c'] = self.proposal.submitter_phone
     attrs['cms_proposal_id__c'] = self.proposal.id
     if session_type_id = self.proposal.session_type_id
-      sf_session_type = Sf::SessionType.find_by(cms_session_type_id__c: session_type_id) 
+      sf_session_type = Sf::SessionType.find_by(reg_event_id__c: sf_event.Id, cms_session_type_id__c: session_type_id) 
       attrs['session_type__c'] = sf_session_type.Id unless sf_session_type.blank? 
     end
     if primary_track_id = self.proposal.primary_track_id
-      sf_primary_track = Sf::Track.find_by(cms_track_id__c: primary_track_id)
+      sf_primary_track = Sf::Track.find_by(reg_event_id__c: sf_event.Id, cms_track_id__c: primary_track_id)
       attrs['primary_track_id__c'] = sf_primary_track.Id unless sf_primary_track.blank? 
     end
     if secondary_track_id = self.proposal.secondary_track_id
-      sf_secondary_track = Sf::Track.find_by(cms_track_id__c: secondary_track_id)
+      sf_secondary_track = Sf::Track.find_by(reg_event_id__c: sf_event.Id, cms_track_id__c: secondary_track_id)
       attrs['secondary_track_id__c'] = sf_secondary_track.Id unless sf_secondary_track.blank? 
     end
     attrs['timestamp__c'] = Time.now.iso8601
diff --git a/lib/sf/version.rb b/lib/sf/version.rb
index df228df..c6de49f 100644
--- a/lib/sf/version.rb
+++ b/lib/sf/version.rb
@@ -1,3 +1,3 @@
 module Sf
-  VERSION = "0.1.22"
+  VERSION = "0.1.23"
 end