Fix the parsing issues

I’m the best merger, ever.