[master shield + flag fix]