Fix issue 2448