Fix Issue 10058.