More consistent with Logblock Patch