fix of #124
update on live edit #105