Fix issue 3839