Fix issue 3921