Fixing line break issues