Fixed one more shield edge case