fixed  issue 7857