Patch to fix issue 21535