fixup my last changes