And fix the previous patch.