[master shield fix]