Fixed line issues