Fix a bug for value using dot or dash in their name
v2.5.5