Source $property mapping fix

Source $property mapping fix