From ENG, fixed issue #9 and #10