Patch against 3.0.1