fixed issue 10002