Fix issue 3856