Merge "Checked the flag not set in the correct way" into nyc-dev