fixed issue 1647