   execute: (count=1) ->
     @scan()
     @match count, (pos) =>
-      @editor.setCursorBufferPosition(pos)
+      @editor.setCursorBufferPosition(pos.range.start)
 
   select: (count=1) ->
     @scan()
     cur = @editor.getCursorBufferPosition()
     @match count, (pos) =>
-      @editor.setSelectedBufferRange([cur, pos])
+      @editor.setSelectedBufferRange([cur, pos.range.start])
     [true]
 
   match: (count, callback) ->

    cur = @editor.getCursorBufferPosition()
    matchPoints = []
    iterator = (item) =>
      matchPoints.push(item.range.start)

    @editor.scan(regexp, iterator)

    previous = _.filter matchPoints, (point) =>
      if @reverse
        point.compare(cur) < 0
      else
        point.compare(cur) <= 0

    after = _.difference(matchPoints, previous)
    after.push(previous...)

      @reverse=false
    else
      @character = ''

    @character

  getCurrentWordMatch: ->
