Sandpatch

From the OC generator.