Better handling of line delimiter