Fixing New line issues