Fix parsing for keys with non-a-z characters