Fixed issue not detecting operator at end of line.
Merged from master