undefined keys fixed