fix avoid-edges support for shields - closes #983