Fix issue where flag would not disable two-state