Fix re-visiting bug