[FIX] Set flag as True because in these cases the SO line name not neede...