             @plot_view.x_range, @plot_view.y_range,
             x_range,
             # XXX: @glyph.x.field (etc.) indicates this be moved to Glyph
-            @glyph.y.field,
-            @glyph.x.field,
-            [@glyph.y.field],
+            @glyphView.glyph.y.field,
+            @glyphView.glyph.x.field,
+            [@glyphView.glyph.y.field],
             transform_params
           )
         else

      source = @mget('data_source')
      t0 = Date.now()

      @all_indices = @glyph.set_data(source)

      @selection_glyph.set_data(source)
      @nonselection_glyph.set_data(source)

      dt = Date.now() - t0
      logger.debug("#{@glyph.model.type} glyph (#{@glyph.model.id}): set_data finished in #{dt}ms")

      @have_new_data = true


        @set_data(false)
        @need_set_data = false

      @glyphView._map_data()

      @selection_glyph._map_data()
      @nonselection_glyph._map_data()
