Don't auto map keys, fixes #32