fix visitors bugs