This fix is patched by alimansour2000