fixed issue 10004