Patch cx23885, second attempt