Further fixed the problem with live evaluation