diff --git a/spec/text-editor-spec.js b/spec/text-editor-spec.js
index cece5d753..382d020d4 100644
--- a/spec/text-editor-spec.js
+++ b/spec/text-editor-spec.js
@@ -2007,13 +2007,17 @@ describe('TextEditor', () => {
 
       describe('when the cursor is between two words', () => {
         it('selects the word the cursor is on', () => {
-          editor.setCursorScreenPosition([0, 4])
+          editor.setCursorBufferPosition([0, 4])
           editor.selectWordsContainingCursors()
           expect(editor.getSelectedText()).toBe('quicksort')
 
-          editor.setCursorScreenPosition([0, 3])
+          editor.setCursorBufferPosition([0, 3])
           editor.selectWordsContainingCursors()
           expect(editor.getSelectedText()).toBe('var')
+
+          editor.setCursorBufferPosition([1, 22])
+          editor.selectWordsContainingCursors()
+          expect(editor.getSelectedText()).toBe('items')
         })
       })
 
diff --git a/src/cursor.js b/src/cursor.js
index 6cd0cc623..10bdef804 100644
--- a/src/cursor.js
+++ b/src/cursor.js
@@ -594,7 +594,7 @@ class Cursor extends Model {
   getCurrentWordBufferRange (options = {}) {
     const position = this.getBufferPosition()
     const ranges = this.editor.buffer.findAllInRangeSync(
-      options.wordRegex || this.wordRegExp(),
+      options.wordRegex || this.wordRegExp(options),
       new Range(new Point(position.row, 0), new Point(position.row, Infinity))
     )
     const range = ranges.find(range =>