Line delimiter problem, back to lastest state  (reopen #69)