Fix issue on property-value