Fix FlagPopulator,java