Fix issue 4212