Change to solve Issue 7071.