last of the 2/3 fixes