fixed bad patch application, again