Fixed Issue #2: If property has a dot in it, parsing fails