Fix issue with static flags