fix in reecent Optional changes