Fixed bug creating too many property-value fields