diff --git a/candran.can b/candran.can
index 8de92df..d9486db 100644
--- a/candran.can
+++ b/candran.can
@@ -241,7 +241,7 @@ function candran.messageHandler(message)
 			for l in originalFile:gmatch("([^\n]*)") do
 				i = i +1
 				if i == line then
-					local extSource, lineMap = l:match("%-%- ([^:]-)%:(%d+)$")
+					local extSource, lineMap = l:match(".*%-%- (.-)%:(%d+)$")
 					if lineMap then
 						if extSource ~= source then
 							return indentation .. extSource .. ":" .. lineMap .. "(" .. extSource .. ":" .. line .. "):"
diff --git a/candran.lua b/candran.lua
index 114e6de..c0c3c83 100644
--- a/candran.lua
+++ b/candran.lua
@@ -3116,7 +3116,7 @@ for l in originalFile:gmatch("([^\
 ]*)") do -- candran.can:241
 i = i + 1 -- candran.can:242
 if i == line then -- candran.can:243
-local extSource, lineMap = l:match("%-%- ([^:]-)%:(%d+)$") -- candran.can:244
+local extSource, lineMap = l:match(".*%-%- (.-)%:(%d+)$") -- candran.can:244
 if lineMap then -- candran.can:245
 if extSource ~= source then -- candran.can:246
 return indentation .. extSource .. ":" .. lineMap .. "(" .. extSource .. ":" .. line .. "):" -- candran.can:247