improvely: fixed setting keys