Patch addressing bug #1814932