     subjectSet: {}
 
   getInitialState: ->
-    page: 1
     pageCount: NaN
     subjects: null
 
   componentWillReceiveProps: (nextProps) ->
-    @setSubjectResources(nextProps.subjectSet.id, "1")
-      
+    if @props.subjectSet.id isnt nextProps.subjectSet.id
+      @setSubjectResources(nextProps.subjectSet.id, 1)
+    else
+      # this updates the page number, when uploading new subjects
+      @setSubjectResources(nextProps.subjectSet.id, nextProps.page)
+
   componentWillMount: ->
-    @setSubjectResources(@props.subjectSet.id, @state.page)
+    @setSubjectResources(@props.subjectSet.id, @props.page)
 
   setSubjectResources: (subjetSetId, page) ->
     gettingSetMemberSubjects = apiClient.type('set_member_subjects').get

          <span className="form-help error">{@state.deletionError.message}</span>}
      </p>
    </div>

  handleSubmit: (e) ->
    e.preventDefault()

    successfulCreates: []
    successfulUploads: []
    creationErrors: []
    page: 1

  componentWillReceiveProps: (nextProps) ->
    # for new subject sets, set the page number to 1
    if @props.subjectSet.id isnt nextProps.subjectSet.id
      @newPage(1)

  subjectLimitMessage: (project_subject_count, user) ->
    "The project has " + project_subject_count + " uploaded subjects. " +
