More lines fixed