NewEdt Branch: fix error

Marge to Master Branch