Fix lambda after separation of visitors