Better fix to unwanted line breaks.