Correct handling of string keys