diff --git a/src/Row.php b/src/Row.php
index 096e1b9..9a7aa77 100644
--- a/src/Row.php
+++ b/src/Row.php
@@ -306,7 +306,7 @@ class Row {
 				if ($i < strlen($this->render))
 				{
 					$nextChar = $this->render[$i];
-					if ($nextChar !== '.' && ! is_digit($nextChar))
+					if (stripos('abcdefx.1234567890', $nextChar) === FALSE)
 					{
 						return true;
 					}
@@ -469,15 +469,15 @@ class Row {
 	 */
 	protected function highlightCharacter(int &$i, Syntax $opts): bool
 	{
-		if (($i + 1) >= $this->rsize)
+		$char = $this->render[$i];
+
+		if (($i + 1) >= $this->rsize || $char !== "'")
 		{
 			return false;
 		}
-
-		$char = $this->render[$i];
 		$nextChar = $this->render[$i + 1];
 
-		if ($opts->characters() && $char === "'")
+		if ($opts->characters())
 		{
 			$offset = ($nextChar === '\\') ? $i + 3 : $i + 1;
 			$closingIndex = strpos($this->render, "'", $offset);