Little modification of visitor