fix indexing of single keys