Fix bug with line numbers & context trimming