Fix issue 3889