Added fight visible check