First draft of fixing lineNumber and lineStart, works for my one test case