[1.16c] Secondary targeting issues