B-987: Patch