Fixed line break issues