Fix issue 2460