Fix issue 4814