Fix issue 2010#c6951