Nov 3 fixes