diff --git a/elm.json b/elm.json
index cd01bd9..f48383a 100644
--- a/elm.json
+++ b/elm.json
@@ -12,7 +12,8 @@
     "dependencies": {
         "elm/core": "1.0.0 <= v < 2.0.0",
         "elm/parser": "1.1.0 <= v < 2.0.0",
-        "elm/regex": "1.0.0 <= v < 2.0.0"
+        "elm/regex": "1.0.0 <= v < 2.0.0",
+        "pithub/elm-parser-bug-workaround": "1.0.0 <= v < 2.0.0"
     },
     "test-dependencies": {
         "elm-explorations/test": "2.0.1 <= v < 3.0.0"
diff --git a/src/Yaml/Parser/Util.elm b/src/Yaml/Parser/Util.elm
index 76729eb..027bcd7 100644
--- a/src/Yaml/Parser/Util.elm
+++ b/src/Yaml/Parser/Util.elm
@@ -28,6 +28,7 @@ module Yaml.Parser.Util exposing
     )
 
 import Parser as P exposing ((|.), (|=))
+import Parser.Workaround
 import Regex exposing (Regex)
 
 
@@ -180,7 +181,7 @@ whitespace =
 {-| -}
 comment : P.Parser ()
 comment =
-    P.lineComment "#"
+    Parser.Workaround.lineCommentBefore "#"
 
 
 
@@ -297,7 +298,7 @@ doubleQuotes =
 remaining : P.Parser String
 remaining =
     P.succeed ()
-        |. P.chompUntilEndOr "\n...\n"
+        |. Parser.Workaround.chompUntilEndOrBefore "\n...\n"
         |> P.getChompedString