Tweak suspicious placement; #597