Fixed expression issue on editor (#2517)