Fixed issue with string and range keys