Inserted potential fix for flag place issue