Quick patchup, disabling history