Fix issue 3669