Fixed clear_keys