Fix issue 4037