fixed #4527. finish