Fix maps with 1-character String key with null value