Ensure line with no escape problems

Way bether than latter merge.