flag fix2