diff --git a/source/global/version.bas b/source/global/version.bas
index 66d164638..310505b50 100644
--- a/source/global/version.bas
+++ b/source/global/version.bas
@@ -3,5 +3,5 @@ DIM SHARED BuildNum AS STRING
 Version$ = "1.000"
 'BuildNum format is YYYYMMDD/id, where id is a ever-increasing
 'integer. If you make a change, update the date and increase the id!
-BuildNum$ = "20160818/45"
+BuildNum$ = "20160820/46"
 
diff --git a/source/ide/ide_methods.bas b/source/ide/ide_methods.bas
index 5a2cd0e73..ce8a10bf8 100644
--- a/source/ide/ide_methods.bas
+++ b/source/ide/ide_methods.bas
@@ -2252,7 +2252,9 @@ FUNCTION ide2 (ignore)
             'identify word or character at current cursor position
             a$ = idegetline(idecy)
             x = idecx
+            IF LEN(a$) > 0 AND x = LEN(a$) + 1 THEN x = x - 1
             IF x <= LEN(a$) THEN
+                IF MID$(a$, x, 1) = " " OR MID$(a$, x, 1) = "(" THEN x = x - 1
                 IF alphanumeric(ASC(a$, x)) THEN
                     x1 = x
                     DO WHILE x1 > 1