bug fix on visit (local)
bug fix on visit (local)