 
     console.debug "Rendering page #{ page.page.pageNumber }"
 
-    @_annotator.setPage page.page
-
-    page.page.getTextContent().then (textContent) =>
+    $displayPage = $("#display-page-#{ page.pageNumber }")
+    $canvas = $displayPage.find('canvas')
+
+    # Redo canvas resize to make sure it is the right size
+    # It seems sometimes already resized canvases are being deleted and replaced with initial versions
+    viewport = @_viewport page
+    $canvas.attr
+      height: viewport.height
+      width: viewport.width
+    $displayPage.css
+      height: viewport.height
+      width: viewport.width
+
+    renderContext =
+      canvasContext: $canvas.get(0).getContext '2d'
+      textLayer: @_annotator.textLayer page.pageNumber
+      imageLayer: @_annotator.imageLayer page.pageNumber
+      viewport: @_viewport page
+
+    page.page.render(renderContext).then =>
       # Maybe this instance has been destroyed in meantime
       return if @_pages is null
 
-      @_annotator.setTextContent page.pageNumber, textContent
-
-      $displayPage = $("#display-page-#{ page.pageNumber }")
-      $canvas = $displayPage.find('canvas')
-
-      # Redo canvas resize to make sure it is the right size
-      # It seems sometimes already resized canvases are being deleted and replaced with initial versions
-      viewport = @_viewport page
-      $canvas.attr
-        height: viewport.height
-        width: viewport.width
-      $displayPage.css
-        height: viewport.height
-        width: viewport.width
-
-      renderContext =
-        canvasContext: $canvas.get(0).getContext '2d'
-        textLayer: @_annotator.textLayer page.pageNumber
-        imageLayer: @_annotator.imageLayer page.pageNumber
-        viewport: @_viewport page
-
-      page.page.render(renderContext).then =>
-        # Maybe this instance has been destroyed in meantime
-        return if @_pages is null
-
-        console.debug "Rendering page #{ page.page.pageNumber } complete"
-
-        $("#display-page-#{ page.pageNumber } .loading").hide()
-
-      , (args...) =>
-        # TODO: Handle errors better (call destroy?)
-        console.error "Error rendering page #{ page.page.pageNumber }", args...
+      console.debug "Rendering page #{ page.page.pageNumber } complete"
+
+      $("#display-page-#{ page.pageNumber } .loading").hide()
 
     , (args...) =>
       # TODO: Handle errors better (call destroy?)

    , (args...) =>
      # TODO: Handle errors better (call destroy?)
      console.error "Error showing #{ @_id }", args...

  checkRender: =>
    for page in @_pages or []


            @_progressCallback()

            # Initialize annotations
            @annotate page

            # Check if new page should be maybe rendered?
            @checkRender()

